merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:49 +0000 (09:37 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:49 +0000 (09:37 +0900)
commitb03817b3bf03557e7208ceb6f7c3742a4915493d
treedcb91419df37f0ffde4412e714d766d5fbc54801
parent3995f369c1e1c824326c76f086158eaf187dcfcd
parentf4654145eb619690774bd1f5ba05c5f607174b7b
merge trunk